From 952d0fd23fa9dbcf26aedf5bfd91c54a6addaf49 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 10 Apr 2016 23:52:00 -0400 Subject: [PATCH] window: Stop using gdk_screen_get_n_monitors --- gtk/gtkwindow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 8284fb20bf..87e65ac7ca 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6188,7 +6188,7 @@ gtk_window_map (GtkWidget *widget) GtkWindowPrivate *priv = window->priv; GdkWindow *gdk_window; GList *link; - GdkScreen *screen; + GdkDisplay *display; if (!_gtk_widget_is_toplevel (widget)) { @@ -6196,10 +6196,10 @@ gtk_window_map (GtkWidget *widget) return; } - screen = _gtk_window_get_screen (window); - if (priv->initial_fullscreen_monitor > gdk_screen_get_n_monitors (screen)) + display = gtk_widget_get_display (widget); + if (priv->initial_fullscreen_monitor > gdk_display_get_n_monitors (display)) priv->initial_fullscreen_monitor = -1; - + gtk_widget_set_mapped (widget, TRUE); child = gtk_bin_get_child (&(window->bin)); @@ -6410,7 +6410,7 @@ gtk_window_guess_default_size (GtkWindow *window, int minimum, natural; widget = GTK_WIDGET (window); - display = gdk_screen_get_display (_gtk_window_get_screen (window)); + display = gtk_widget_get_display (widget); gdkwindow = _gtk_widget_get_window (widget); if (gdkwindow) -- 2.30.2